Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 12 Feb 2012 21:20:56 +0000 (13:20 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 12 Feb 2012 21:20:56 +0000 (13:20 -0800)

Trivial merge